Fixing some tests
More test fixing
More test fixing
More errors…