adding missing module.
fixing tests.