Created JUnit test and made DataStorage able to support it