Improved deps for unit tests