Prospect test fixes