Optimization and readability

The task is to optimize the code and the testing itself (timeouts, results checking). There is also a need for improved readability of the results.