Tests output to named files, not stdout, so that make dependency rules can be generated
Fixed bug, better domain model