Tidy up these tests somewhat :-/