Removed if/else from test