Fixing some tests...