Delete old live data + more tests