Fixed tests and dependencies.