Test names improvements

Test names improvements