Merge "add unittest for delete resource types association"