Fixed more
Fixed tests