UPDATE: Fix unit tests