Added couple of more unit test and reformatted source