Fixed tests, disabled some.