reworked test structure into separate drafts