Fix requires in model specs. Get all specs passing.