fixing first run so most tests pass!