Sped up unit tests somewhat
Fix some stuff
+Parameter sanitiser