Add support for uniforms and add appropriate tests