Adapted some test