Fixing tests/feeding hound