Bunch off local storage tests an fixes