some test refactoring
added coverage