Add test. Put back non-nullable types