Debug cleanup and removed unnecessary or deprecated tests