Fix test.
Faster test.
2400 loc -> 1500 loc by creating scope definition creating functions