Making a few more tests pass, but waiting on the datetime PR to be
merged
Fixing a few other tests, but skiping the rest of the method as I don't
have enough power today :)