Extend test and fix dependencies