Fix tests and update usage.