I changed the tests .. please check that tests behaves as it should.