Fixing tests
Working tests