Make tests in a classic way
Fix tests