Fix a previous interrupted test causing next test failure
Simply gem creation and improve cleanup