parametrize test and other minor changes