Refactor views to not use  where it's unnecessary
Add a test for assets_with_deactivated_leases