Avoids randomDate error
Adds tests for the new methods