Started tidying up tests