zrrichards: Fix failing tests and comment out the ones that don't yet work.