StateUpdater fixed and tested

should solve #430 and #405