Issue #25: cleaning up test case