Finish remove of StateType

Get all unit tests compiling and running