Add further tests to wall setting
Refactor set wall tests