Clean up test directory structure

Change-Id: I1509bf2b11533104df8a991f18a4f2a4730acec4