All tests run, moved to one file