Simplify orientation checks and remove redundant calls in test.