Fixing tests and updating dependencies