fixing test-bugs