Commit 2 with minor changes

minor changes to make sure test script runs with real end point and
stub implementation