Fixing the tests
test fixed
tests fixed