[BISERVER-10758] - Fixing unit tests
Merge pull request #1338 from pminutillo/localdev

[BISERVER-10758] - Fixing unit tests