redo logic to avoid Travis failures
Merge branch 'develop' into ancillary
begin adding tests