Issue #24: additional cleanup of systemtests