fix attraction bug and test breaks