Rename step_block of assert (after, before) clock
Bugfix (step block's mapping's defalut value and assertion wait)