Fixing common tests
Fixing common tests