Use tests (35/40)

Use tests