Modified some files to make testing work.