Clean ast construction in test_itspace
Improve ast construction in test_itspace