Updated rspec syntax and spree namespacing for readability.

Almost same as #2770 but without unnecessary blank lines removal. Did not remove unnecessary modal nesting of specs but added namespace to models to make nesting safe to remove when pleased.