Even better shader test
Merge pull request #6747 from ricardoquesada/improved_shader_test

Even better shader test