minor modifications for the test_state, cleaned up some things