Added a few more assertion functions and made them clearer