Refactor this test to be more agreeable with clang