Some fixes with test classs