UPDATE: Fixing some tests...