(WIP) add Assertion and modify its usage in test