Refactors model names; Adds tests; Shows resource url in the form