More test refactoring.
Introduced NetworkException.