Fixing the tests. Backup commit