Nullables and other fixture refactored.