Adding behaviors and tests