Added tests for states and tags