Corrected tests according to first wave of remarks.