Added Cucumber and organized specs a little better