Refactored some assert logic
Merge branch 'hp/pdt-5863' of github.com:Pardot/Rhombus into hp/pdt-5863