Added test for CategoryDao. Changed model structure.