Added simplified test