Add an object defined inside a companion object to tests I believed this case was handled incorrectly, but it is actually handled correctly. Fixes: 394318786 Test: expands a test Change-Id: I48da6b7b610b678343e252b6393d176143a29526