Updated Usage tests