Fixing test files: now everything is green