Testing our super interwoven code.

<whew/>
WHAT DID I JUST DELETE?!?
merged
Removed an unnecessary test.