Added more state tests