Added a lot of categories, test cases etc.