Changed test category and reformat code.