Added test modularization and login special steps.