Fix a test
Remove todo comment which was achieved