Commit correct drill smoke tests, some have to be removed and some small modifications