Split Tests per category, and created more tests.