Added more asserts to tests