Fix tests
Fix typos
CMakeLists.txt: Try to fix compilation on server
Merge branch 'master' into far3

* master:
  CMakeLists.txt: Try to fix compilation on server
  Fix typos
  Fix tests