Stop calling company verification api on devserver
Fix test.  Catch NPE
Limit to 15 on prod builds