Re add oops states test

built on top of #1077