Further refactoring and enabled the exposure population test