Core (tests): New test assert macro
Merge code