Spec cleanup, adding cucumber