updated tests, simplified states