Fix unit tests

Fixes unit tests