Add fixes and to-dos for failing null-related assertions and 'xit' their tests.