* Fixing unit test breakage