Some spec refactor and using cucumber now yay