Remove unused spec code + clean up style
Update PhysicalItem and PaymentMethod specs for better test coverage