Remove CSFTests dependency