One fix, two tests