Removed some superfluous setup/teardown methods. Removed a couple maybe-unresolveable TODOs.