Status Controller test cleanup