Multiple changes, remove errors, mostly in Test files.