Updated code to better run all tests.