chore: tests fixing to pass