Wrapped interfaces in module. Updated tests.