test suite cleanup, removing applyToAll
lots of cleanup, refactoring, test updates