Adding the other crap that I forgot previous for StateTest and
StateTest2