fixes for previous merge; unit tests are back to normal, fixing one additional test that failed prior to merge

please review