[misc] Add unit test
[misc] Cleanup