Got rid of old uniform type
Did work
Fixed merge cleaning up tests and uniforms