Addressed Martín's comments + fixed tests