tests: simpler if..else logic (think straight!)
typos
typo