reorganizing test utilities
completing helper functions to clean up test code.  IT WORKS\!\!\!