Removed TODO and a few skipped integration tests.