More work on module life cycle unit testing - TRUNK-4134