Added FindAndRemoveAcceptanceTest, and played some more with the common acceptance test functionality.