Change signatures and fix tests

Peloteemos este branch.