Tidy up of mixing in base tests onto sub-modifier
Restored local variables for consistency with all other modifiers' tests
Modifier only goes to COMPLETE state if the error received is a network error
Extract method to name network error clearly
Remove old todo comments