Got the unit-scale tests working.