[REFACTOR] Delete empty key if exists before execute test logic on it

[REFACTOR] Delete empty key if exists before execute test logic on it #8