Narrow down Test 2, after review