added uniforms, working test