Misc changes; cukes still broken

Fixed some tests; Fixed a typo; etc...