mpt: convert tests to array based list
mpt: adjust tests from #36