Fixing to make testing work