fix path encoding related issues
Fixed missing junit test definition
Added couple of more unit test and reformatted source