Break out separate assertions into their own tests

DHC-767

Change-Id: I4e792d98e796f5ac397d76b65203a86ef71bf4cc