@pechichemena: More tests