Issue #24: cleanup of system tests