Refactor Storage Controller and get Storage tests working again