Changed test framework to utilize classes to order static initialization.