cleared not in calculation, adjusted tests