Made changes to old tests consistent to refactors and all tests pass