*8067* Fixed broken unit tests