fix enough errors so tests can run