agnosticbin: Test cleanup

Change-Id: I3d4e92fd42ed105aaf13f4f145d982daa0929130