Fix formatting in log messages
Replace nasty C++-based test with a test driven through CMake
Remove redundancy
Attempt to make the git push more resilient by retrying once