fix client tests
client test fix2
user money transaction
clean main
Sergio merge
Sergio merge