- improved testmode