Fixed or commented out (mostly fixed) breaking unit tests.