Test: Test suite getting bloated

[williscool]

I think there is an an opportunity to consolidate a lot of stuff that is not as useful testing things that are too simple stuff like that