Corrected some testing issues.