Builds successfully again, minor bug somewhere, tests failing