Improve quality of service tests. #116