Revoked old tests; Added empty string check