Modification

Added timer in unittest
and tweak on the lineparser