Fixing non-compilable tests