Got test suite running, still tests failing.  Fixed packager