Moving more tests to appropriate locations

Change-Id: I06aa8d8f31593cfea6e26560d6af2caf6a29194d
Merge "Moving more tests to appropriate locations"