Moved assertion helpers into a separate package