Update all references to old extended_service_life_years - is now extended_service_life_months
fix max_service_life factory girl setting
Merge pull request #1 from camsys/fix_tests

Fix tests