Moved to much thinner test framework to test against flat files