added switch tests