Comment on Refactor to add tests and more modules