Cucumber Test cleanup.  Fixed 4 tests, marked 3 as pending….