Updated tests to work with the new results object