Fixed Entities, added testing, working on venta unitaria