Expanded modularize tests.