test refactoring
more tests refactoring
it is not so smart to badge master that shoud always work