Import some tests from MPB to kick the tires some more