Merge https://github.com/daonb/okqa into multi
Merge branch 'multi' of https://github.com/daonb/okqa into multi
imporve tests
Improve the user app and its tests