Add stop() capability and add integration test