tests correction for B and P, design enhanced