Add more test cases to support State service