further test refactoring/adding