Storage method implementations + tests