Major improvements to test speed.
Removed unnecessary check making tests REALLY slow.
Further speed up tests.