Refactoring.  Test update