Rewrite Unit tests for the storag