Enhance tests and add assertions