Improvments on the shader2 tests

Improvments on the shader2 tests