Or you can stick with the existing design. But there's absolutely no reason to have more classes in the Nullables version than in the mocked-base version, as you claimed in your readme. Nullables support a low ceremony approach: no interfaces, no layers, no nothin'... until you actually need them.