Add a missing dependency.
Pull 6model tests out to a separate file.
Split out aggregate tests also.