State2 and Friends -> Fix all 107 unit tests!  State2 objects are green light for Launch.