Graphics testing.
Fixing conflicts.