Revert "unit testing fix"

This reverts commit 5636cc1629cedde307560b2832d0fb39d493e413.