WIP - check _state naming in tests