made all tests testling friendly