Added first part of new create test structure.