Add failing tests for yet-to-be-converted tests
Add TODO items
Fix some test errors