Complete data definitions and test cases

Finished the dreaded test cases and data definitions. Check to see if it
is all good.