Adjust tests to account for new -e option to add and rework