This commit adds 2 C&S to start with running natively. Also, adds logic to
print out diffs for these in case of failures for easy troubleshotting.