array and multiple switch options
minor test changes