Use tests (30/40)

Use tests