small misc changes; library call added to tests for easier debugging