modified tests and deleted unnecessary code resulting from earlier refactor…