NIFI-169 updating a few tests and build