Merge "Bug 116 - Revisit SanityTest"