made all tests working