Updated unit tests
Updated parser
Added dates comparison