Merge "Move more test code to CommonArtTest" am: 267c835298
am: c6afe5c71e

Change-Id: Ib112c54bdb05f885a3fbdcd5e316e56cddfa1c67