Fixing tests that was broken