[modularization] Add new tests