Fix tests so they'll work with jepso-ci