Back porting module life cycle tests - TRUNK-4134
Follow up to fix failing changeset - TRUNK-4125