[WIP] Unit test clean