test refactoring complete. not feature complete, but ready to integrate