Use tests (36/40)

Use tests