Updated tests to work with new setup