Minor refactor to empty string testing