Modified some test files because of changed source files