Revert "Bug 17278: Fix test compilation errors"