Testing suite improvements.