trying to fix bug in safari
update to switch branchs
convert to karma testing