simplify tests in order to make it more readable