Complete test and use consistently symbols everywhere