add test on bug and refactoring
Merge branch 'feature/262_registration_bugfix' into staging