Added '--test=' option