start of testing refactoring