Added tests for some states