added some of Matt's internal tests