Fixing :validate bug and broken tests