Fixed tests and an error.