add mpfd
more test structure