add factory girl traits and mix/match notes