fix dmi order of arguments, all tests pass now
cleanup dmi tests