Bug 20866: (QA follow-up) Use build_object and remove two tests