Update cucumber environment to tear things down properly