Fixing test data
Added test cleanup