Issue #133: working unit tests