Continued cleanup on models and tests
fixed bugs with url structure from refactors