Removed test function; added redirect to switch.