Reordered tests, added some more, added a multiplexer for the error
outputting.