Updates to snippets for unit testing
Label as work in progress