More unified module, make unit tests pass for both brower and node