Added missing modules
Changed the order of mock set up
Converted git-pom