tests and fixes
Merge branch 'master' of github.com:miataru/miataru-server