Add test for STI
Fix test after introducing STI-support