[#1117] Lots of work on the testing coding standards