make tests match code