Tests, template/url improvements, new fields