Issue#3 .. fix unit tests