Refactoring test. -Jon