refactor tests - remove duplicate code and change StorageHandler public interface
fix test
fix NullPointerException
fix tests
fix test and rename method
refactor tests