Added a bunch more imports and a lazy import strategy for 25% perf boost.
Added a few more unit tests.