ticket:9 redundancy in tests is removed