New way of run test + various fixes