Fixing all tests