Added number / date unit tests