Add extra asserts to tests