restructuring tests a little
err, don't leave -x in there
restructured tests a little more

got them all passing.