Kill test data
Fixing wall issues