Reorganizing tests to make it easier to run them individually