#12 minor refactoring to test framework