Testing granularity of modules
Further module granularity
Finished module granularity
Merge branch 'dev.granularity'