Removed duplicate test, renamed some existing tests

Removed "_refactor" from the test names.