Start to restructure unit test into modules

Change-Id: Iae92a525ecf76e753b0d58d16e68acb27b80d762