Refactor assertions to better follow convention and make more flexible
Merge pull request #3 from kevinarcher/refactor/Assertions

Refactor assertions to better follow convention and make more flexible