Simplified test creation further.
Added missing headers to bits.
lawyers suck...