Fixing testing issues.