Compacted the test code idiom a bit. Looks nicer, reads better, I have a good feeling about this.