Move tests into tests subdirectory

Change-Id: I72fba38e02e26ca8077e30c0a6e08695edac298f