Added another state and some tests