Removed tests that conflict with test refactor PR