Allow dist install tests

These changes allow a dist install.