Add local typetuple imports to allow unittests to build