Make most tests run correctly