apply more of sam's fixes from #3
fix tests for instantiation and clean up packaging