fixed up tests
made tests for edit resource pass
Merge branches 'master' and 'testing'