Switch creation test to use links