Fixed Unit Tests; fixed require issue for tests.
Fixed module finding issue.