fix basic registration and add test
Merge branch 'payment-code-fuckup' into payment-code-fuckup-views