Test code cleanup. Additional performance test cases. Improved performance testing.