Cleanup
More TODOs
Add skipped test