Some test cleanup and minor team controller fixes