Fix/ofertie of tests