remove vargs from models and tests