remove dead code
add tests for gordon, trestles
Merge branch 'devel'