Updated tests to match wax changes