Fixed ext. module imports, added unit tests to check. Other tests, too.