Fix test compilation
5 files changed