Issue #41 tests updates