Unit test fixes for the N-state model.
This is needed due to the recent package rearrangements.
Authored by: bugman 2013-06-14
Parent: [r20126]
Child: [r20128]