Tidied up tests as per @javanna's comments