Use resource instance variable
Better storage_options validation
More and better looking tests