fix [issues_tests.test_issue8] && tests cleanup