Finishing cleanup tests