Working on MC-236. Adding default waitFor wrapper on `at` assertions and reworking failing test.