added testing and fixed the simple register view
Merge remote-tracking branch 'origin/five' into five