Fixed test suite for Dj 1.7