Fix: some tests