fixes for null-value test and generic source renaming