Add test code to begin refactoring