Changes test to more closely mirror broken internal code