Fixed on how test case are teardown

Signed-off-by: crynobone <crynobone@gmail.com>
Remove invalid variable

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'staging' into develop