Add manual activity create

Plus some test cleanup