Add reinitialization of internal state object

Targets #536

Adds a test for the "bug" as well...