Fixed test names

Closes #584