Organize the unit tests

Change-Id: I6661c678125a3e37fcc49bbdf36747a29c5f907c