Improved nested resource relationship in controllers, improved models, improved tests