tests

Fixed compiling errors
Added to cmake
Merge branch 'master' of https://github.com/hof/qm2.git