Breaking down test suite into flat files
Broke out output files for tests
Normalized all functions to names