Fixing the failing tests and adding the respective dependency