tests now cleaned up