Removing our custom mapper (we don't need it anymore)
Don't test for converted dates