Multiple changes, mostly to remove errors in the Test files.
Multiple changes, remove errors, mostly in Test files.
Removed static from the variables which had it.
Updating something. Everything I seem to update deletes itself after a
few hours...