Convert unit-tests to unittest format
Add comments to unit-test