Tests 23 and 25 modified