Added some more tests + uniformization