Updated Test Suite to new Mocha reqs and fixed require statements