Reworked the guard file and test orgnization so tests will autorun when code files are changed. Added tags to tests to denote unit and integration