command-query tests all pass :+1: