Merge "Adding tests using Domain::KEY_ID."