More test moves into more appropriate locations

Change-Id: I09a59d37a048eebc3b0f30bbe743010815e1691f