Refactoring to allow snippets
Added fixtures