Updated test for new modules