Merge "accessorytest: Remove bad code"