Require getters and setters into each module
Refactor tests to create and use a bundle
Merge branch 'refactor/include-get-set'