Added the backup processing + improved testing