Update to include 'Test' as a separate structure. No need to define it as a class.