Reorganizing tests to be more modular