EAGLESIX-2651: Deps: fix tests and misc formatting