Fix add/remove funds tests