Modified test to accept 2 results returned, which is correct
Modified timestamp to datetime in relevant schema files
Corrected a regex comparison with undef'd string error