refactored teststorage