Remove non-callbacky methods from state
Move initial state expectation to a different block