Added more metadata to models and views.
Added tests.