Updated tests to run