added stop and kill tests, modified some stop and fill functionality