Fix CMake scripts
Fix ST2 project
Add diagnostics test