More progress. Some cucumber tests now have actual code.