Further playing with storage and testing