Unit tests and fix error
Merge branch 'master' of github.com:barif/Meeting