Bring folder tests up to date with test refactor