Completing test when writing
Testing handling of errors
Implement a timeout
Pass the timeout as an argument
Timeout is configurable in command line
Consistent order of arguments
Merge branch 'feature/handle-errors' into develop