Few tests changed and refactor to walls