some work toward testing both bottle and enhance commands.  More integration testing necessary before closing issues