Fixed test compilation errors and a test error