#132: unit tests added