#221 move test util methods to separate test util

-> small renaming and refactoring to make them easy to use