Make clean also reset inc. opt. state in Test config.
Merge pull request #808 from sjrd/clean-opt-state-in-test

Make clean also reset inc. opt. state in Test config.