Adding a Ready state test, correcting others and removed useless state.