Assignment7 submission

Nice, readable test format.