Added sanity checks
Tests are now specified with arguments to program call
Commented out debug-prints