#137 unit tests added