Reducing some code and fixing a couple of tests.

[GhostofCookie]

This has some changes that might not strictly be necessary, but does fix a couple of the breaking tests.