Few fixes to issues found with unit tests
more unit tests