Fixed test helpers
Changed tests names