Add test, change urls and fix serialisation