refs #24: test cleanup