will safe updates() fix unit tests?