cleaning up the test bench a bit