coverage
fixed tests in admin_view_spec
all tests fixed
dumb coverage files
merge conflicts
merge conflicts