Clean up some ugly testing artefacts