#184 - unit tests added