Add NULL byte test with appended extension
Add some todos