done with safari, adding tests