Merging in changes ma by Jesse to the base test.