Adequated tests to conform to new export model from server.js