export classes on module.exports, and fix another test