Mass updates to get tests in order - green lights mean go