[WIP] Cleanup CS, add missing test, cleanup some resource owners