* Fixing unit tests in RELEASE build