Refs #460, finish out test wiring