Improvments on the shader2 tests
Merge pull request #6746 from ricardoquesada/shadertest2_fixes

Improvments on the shader2 tests