I reorganized a bunch of these tests so scroll down until you see where I have marked the real changes