Break out separate assertion into their own tests

DHC-767