Fix failing test
Pretty intense dependent form work. :D
Change up scopes