Problem: Still many old style tests. Solution: Convert several tests to new style. (Yegappan Lakshmanan)