refactored my tests
fixed some minor issues with naming files