Simplify dev dependencies and update tests