passes all tests, moved some more things into TimberTermGetter #262