Develop

Fix tests and minor bugs
vamos todavia!!!!