Initial tests / draft skel updated