Removed representation of state, fixed tests