fix infinite pushing & poping of states + moar mocks