solved some test issues