Test Names

This is to make the test names more consistant.