Fixed minor incosistencies between test schema and expected results.