Test: Minor barontester cleanups