updated assertion macros