removed switch statement from tests