Fixing 1.8 testing issues.