rewritten tests to use fixtures/parametrize