Change many things

Brings test fails from 55 to 32