[+] Add visual test
[+] Refactor spatial