refactor test, remove unneeded $isa
adapted examples