Parser modified and TFTest commented