Merge "add server reset_state tests"