Clean: use AH states in unit test logic Eliminates a chunk of BasePlayer AH field usage, can remove them next Tests: ran unit tests