Cleanup/
Unit Testinng/Internal Typedefs