Fixing style
Added unit test
Remove dummy unit test