Remove more unused code from base test setup