Use tests (33/40)

Use tests