re-arranged simplified test