Adjusting wrapping handlers; adding test lifecycle.stop()