refactor code, change names, add method that runs all the test methods