fixing compilation errors due to the test-common module