Commentary DAO/service and model/DAO/service improvement

Additional relations and models/DAO/services improvement
Fixed deletion test and added tests for enhanced functionality