fix some tests
use shortener when defining classes/interfaces
remove old shortener