Seems these should be broken out into multiple tests.