Added 6.0-2.3 support and tests