moved around state models, adjusted default values so that desired test result is closer to working (still not there)