Refactoring test cases to include the reading type when saving a device