Moving typing files.  Fixing unit tests.