corrected tests and different style for storage