Fixed Bcl Builds issue in common unit tests