minor cleanups to regression tests for perofrmance