Fixing Specs & Updating Form Code for 1.2.x

Brings things in closer alignment with the latest spree 1.2.x code.