Fixed various issues.  Added helper code to tests.
Fixed the entryPoint reference usage.