Removed some todos. Fixed some tests.