updated tests, tried to fix safari