Make test naming consistend