Fixed backup argument names
Updated tests