Final set of fixes for Test version 3.
Merge branch 'master' of https://github.com/jmavis/UCSC_Echo_FAB