Fix compilation error
Cleanup unit tests