Added rough test plan, moved state/activity dias