Unittest cleanup