toi parser - changes to existing test and new implementation file