Removed underscores from test category namings