Fixed bug in test where storage listener was being removed