Simplify test to just two cases