Reverted Snippet model changes and fixed tests