clean up state reporting and adjust test