Moved a few more typedefs and classes out of the unit test main.h