[WIP] Fixing unit tests

Fixing unit tests