#150 unit tests added