P26: tests added
P26: Done.