Remove test, add keep_alive