Added some more tests (and found a bug using date values)