Unit testing - remove extra logging and add in missing test16