fix dependencies, fix tests