Corrected some "test" issues.