Down to 7 of 893 unit tests failing