add the extra model fields we'll need, and get tests functional