Breaking apart tests; making them as orthogonal as possible