Break out separate assertions into their own tests

DHC-767