Made a few changes to testing structure and make sure all tests pass