Change over to new interfaces testing by consolidating all state
machine changes into a couple of methods.