changed model assoc and tests