Merge "Move more test code to CommonArtTest"