Make tests pass in strict mode