Refactor test to be reused across architectures