Updated tests to match reworked APIs