master added several tests and fixed tests helpers