Fixing test compile errors and doing changes to the test files