Moved Type to _module;
Added type tests.