minor test refactoring for better grouping
some more unit test refactoring