Building out state functionality and test coverage