Changes to tests to include refs and refactoring of names