Add missing test & update others