Reduce test scope to get passing build