Fix/EN-15 and EN-16 (date issues)

Fixed EN-15 and EN-16
Added unit tests to test these expressions