Changed exports.
Updated tests.