Minor test adjustment
Merge branch 'release/0.12'
Merge tag '0.12' into develop

Bugfixes and CMakeLists.txt tuning

Thanks to dirkvdb