tests now fully corrected