Use parametrize for tests

@keflavich - can you merge this in to your branch?