Back out changes to states, add assertion to test