Multiple changes, mostly to remove errors in the Test files.