Fixes Usage tests