Various testing imrovements.