Fix the assertions
Pepify the fields module and remove a redundant import
Pepify the shop forms
Pepify the shop code