move to intern 2.1.x + add tests