I think we'll see both landing within the next 3 test flights. At least I hope, I don't know why they wouldn't also want to test that immediately.
But let's not forget, the heavy booster is not planned to land like the falcon 9 rockets, but is planned to be catched, which ofcourse will be a big sensation too, as the first time it will probably destroy the tower, which will be a very entertaining and impressive thing to watch
I just hope we'll see the next test flight within a couple of weeks, with even more things going correct.