Cosmetic change to model classes, small tests update.