Fixed tests and dependencies