make test and bootstrap targets more consistent