clean up unused code in tests