Added more asserts