Fede Barrios collaboration: Finish implementation context, add more tests