Added fixture abstraction