minor cleanup in test helpers