Tidy up some tests to help checking jenkins SL's build