Fixing tests (ongoing)