Tweak some tests to help sl