Start test/wsh redesign