Split but#96 into two tests as per feedback from @earl