Update usage according to changed API
Minor test improvements