Fix nil class bug, and capture with Cucumber tests