Improved riddle:TEST.