Added main testing, and fixed other testing, and things. B.
Missed a couple additions.