added more cleanup to the tests
merged with sofa
house keeping