Moved StorageTest to StorageJUnitTest