persisting local changes to a resource back to CF; more unit tests; misc
cleanup