Full test Suite of status checking

Lots of random fixes around codebase