* Make more code conform to strict null checks * Fix types * Fix tests * Fix remaining test assertions * Iterate PR