Fix BaseProvider#update & Clean up tests