Merge pull request #6746 from ricardoquesada/shadertest2_fixes

Improvments on the shader2 tests
Even better shader test
Merge pull request #6747 from ricardoquesada/improved_shader_test

Even better shader test