LOCAL: Fixing unit test