updated..
adding fixed unit tests