Commit after refactoring Tests need to be updated