Refactor tests and scenarios to use fixtures