Some initial work towards test cleanup