Get most unit tests passing (some remain to be reenabled)