corrected remaining tests