Cleanup CS, add missing test, cleanup RedditResourceOwner