increase max to ave factor, improve tests