Simplify class name
Use uniform structure for tests. Prefer lazy initialization in tests.