Refactoring to use CommonJS style modules - unit tests fail
unit tests passing