Minor conciseness improvement
Test improvements