fix constructor param ordering, double handling of nrtm sources, and fix tests