Dependency and testing cleanup