Getting rid of Cucumber version of tests. New stuff coming shortly.