Commented out some tests that are hard to read and maintain, and which
@andyberry88 is going to take a look at when he gets a chance.
Fixed a couple of compiler warnings.