tests correction, new design