Fixing test
More TODOs