Revert "Debug unit tests..."

This reverts commit da13888ef18ee5424a5503244eee777cbcf01980.