Small changes switch and switch test