Update todo and inclue full parser test file