Adds D6-specific tests