+ more testing code