Fixes a few issues with current SimpleTests

I'll eventually move the unit tests that I removed into another test class once I determine what overlap exists.