Tidying up some tests

:D